diff --git a/tests/Cargo.lock b/tests/Cargo.lock
index 9c7dddf8..a4cffd9d 100644
--- a/tests/Cargo.lock
+++ b/tests/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "autocfg"
@@ -234,7 +234,7 @@ dependencies = [
  "gumdrop",
  "md5",
  "minifb",
- "rusticnes-core",
+ "rustico-core",
 ]
 
 [[package]]
@@ -456,9 +456,9 @@ dependencies = [
 ]
 
 [[package]]
-name = "rusticnes-core"
+name = "rustico-core"
 version = "0.2.0"
-source = "git+https://github.com/zeta0134/rusticnes-core.git#c3fce7960c3335eb5707242f5db22fa35a6d682d"
+source = "git+https://github.com/zeta0134/rustico.git?rev=d31d380b1e15bf7cc80e8827730e56a6df77ae46#d31d380b1e15bf7cc80e8827730e56a6df77ae46"
 
 [[package]]
 name = "rustix"
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 9326ce1a..9f2f3c32 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 gumdrop = "0.8.1"
-rusticnes-core = { git = "https://github.com/zeta0134/rusticnes-core.git", version = "0.2.0" }
+rustico-core = { git = "https://github.com/zeta0134/rustico.git", rev = "d31d380b1e15bf7cc80e8827730e56a6df77ae46" }
 minifb = "0.27"
 
 # for patch testing
diff --git a/tests/README.md b/tests/README.md
index 3f6a2146..571aa09e 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -12,4 +12,4 @@ to verify various behaviour in the game, first build the ROM then run;
 cargo run --release -- --test
 ```
 
-uses [rusticnes-core](https://github.com/zeta0134/rusticnes-core)
+uses [rustico-core](https://github.com/zeta0134/rustico)
diff --git a/tests/src/crunch.rs b/tests/src/crunch.rs
index b7765fe6..a4eeac30 100644
--- a/tests/src/crunch.rs
+++ b/tests/src/crunch.rs
@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 use crate::{util, labels, playfield};
 
diff --git a/tests/src/garbage.rs b/tests/src/garbage.rs
index 0f322763..6da54e0d 100644
--- a/tests/src/garbage.rs
+++ b/tests/src/garbage.rs
@@ -1,5 +1,5 @@
 use crate::{util, labels, playfield};
-use rusticnes_core::memory::read_byte;
+use rustico_core::memory::read_byte;
 
 pub fn test_garbage4_crash() {
     let mut emu = util::emulator(None);
diff --git a/tests/src/harddrop.rs b/tests/src/harddrop.rs
index 7e3b85bc..f9ba2599 100644
--- a/tests/src/harddrop.rs
+++ b/tests/src/harddrop.rs
@@ -1,5 +1,5 @@
 
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 use crate::{ util, labels, playfield};
 
@@ -209,9 +209,11 @@ fn test_harddropped_piece(emu: &mut NesState, start: &str, finish: &str, piece:
 
     // stage ghost piece
     let temp_pc = emu.registers.pc;
+    let temp_tick = emu.cpu.tick;
     emu.registers.pc = stage_sprite;
     let stage_cycles = util::cycles_to_return(emu);
     emu.registers.pc = temp_pc;
+    emu.cpu.tick = temp_tick;
 
     util::run_n_vblanks(emu, 1);
 
diff --git a/tests/src/hz_display.rs b/tests/src/hz_display.rs
index 62060904..f1624a0b 100644
--- a/tests/src/hz_display.rs
+++ b/tests/src/hz_display.rs
@@ -1,5 +1,5 @@
 use crate::{labels, util};
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 pub fn test() {
     test_standard();
diff --git a/tests/src/main.rs b/tests/src/main.rs
index 244f9c48..c47905fd 100644
--- a/tests/src/main.rs
+++ b/tests/src/main.rs
@@ -160,8 +160,8 @@ fn main() {
             emu.memory.iram_raw[rng_seed] = (seed >> 8) as u8;
             emu.memory.iram_raw[rng_seed + 1] = *seed as u8;
 
-            rusticnes_core::opcodes::push(&mut emu, (main_loop >> 8) as u8);
-            rusticnes_core::opcodes::push(&mut emu, main_loop as u8);
+            rustico_core::opcodes::push(&mut emu, (main_loop >> 8) as u8);
+            rustico_core::opcodes::push(&mut emu, main_loop as u8);
 
             for _ in 0..23 {
                 emu.run_until_vblank();
diff --git a/tests/src/mapper.rs b/tests/src/mapper.rs
index b268cd7d..066a1d51 100755
--- a/tests/src/mapper.rs
+++ b/tests/src/mapper.rs
@@ -4,7 +4,7 @@ use crate::{
     playfield,
     util,
 };
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 pub fn get_expected_tilesets() -> (Vec<u8>, Vec<u8>) {
 
diff --git a/tests/src/playfield.rs b/tests/src/playfield.rs
index 1568b18f..09253f2e 100644
--- a/tests/src/playfield.rs
+++ b/tests/src/playfield.rs
@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 use crate::labels;
 
 pub fn set(emu: &mut NesState, x: u16, y: u16, value: u8) {
diff --git a/tests/src/score.rs b/tests/src/score.rs
index 6535f76d..96f938d6 100644
--- a/tests/src/score.rs
+++ b/tests/src/score.rs
@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 use crate::{labels, score, util};
 
 pub fn set(emu: &mut NesState, score: u32) {
diff --git a/tests/src/sps.rs b/tests/src/sps.rs
index 8197b061..4fcdca3e 100644
--- a/tests/src/sps.rs
+++ b/tests/src/sps.rs
@@ -1,5 +1,5 @@
 use crate::{block, labels, util};
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 pub struct SPS {
     emu: NesState,
diff --git a/tests/src/util.rs b/tests/src/util.rs
index d230b4d9..a27fe0de 100644
--- a/tests/src/util.rs
+++ b/tests/src/util.rs
@@ -1,5 +1,5 @@
-pub use rusticnes_core::nes::NesState;
-use rusticnes_core::{ cartridge, opcodes, opcode_info };
+pub use rustico_core::nes::NesState;
+use rustico_core::{ cartridge, opcodes, opcode_info };
 use crate::{input, labels};
 
 pub static ROM: &'static [u8] = include_bytes!("../../tetris.nes");
diff --git a/tests/src/video.rs b/tests/src/video.rs
index 884cfc3c..17db4527 100644
--- a/tests/src/video.rs
+++ b/tests/src/video.rs
@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 use minifb::{Window, WindowOptions, Key, KeyRepeat};
 
 pub const WIDTH: usize = 256;