diff --git a/src/colour.rs b/src/colour.rs
index 5c1ff5f..b97b9db 100644
--- a/src/colour.rs
+++ b/src/colour.rs
@@ -35,7 +35,7 @@ mod test {
     use crate::colour::Colour;
 
     #[test]
-    fn test_colour_from_string() {
+    fn colour_from_string() {
         assert_eq!(
             Colour::from("0,255,0").unwrap(),
             Colour { red: 0, green: 255, blue: 0 }
@@ -43,22 +43,22 @@ mod test {
     }
 
     #[test]
-    fn test_colour_to_string() {
+    fn colour_to_string() {
         assert_eq!(Colour { red: 22, green: 33, blue: 44, }.to_string(), "22,33,44".to_string());
     }
 
     #[test]
-    fn test_colour_missing_value() {
+    fn colour_missing_value() {
         assert!(Colour::from("0,0").is_err());
     }
 
     #[test]
-    fn test_colour_ambiguous_value() {
+    fn colour_ambiguous_value() {
         assert!(Colour::from("0,0,").is_err());
     }
 
     #[test]
-    fn test_colour_extraneous_value() {
+    fn colour_extraneous_value() {
         assert!(Colour::from("0,0,0,0").is_err());
     }
 }
diff --git a/src/dialogue.rs b/src/dialogue.rs
index 829ad30..07d702a 100644
--- a/src/dialogue.rs
+++ b/src/dialogue.rs
@@ -41,7 +41,7 @@ mod test {
     use crate::dialogue::Dialogue;
 
     #[test]
-    fn test_dialogue_from_string() {
+    fn dialogue_from_string() {
         let output = Dialogue::from(
             "DLG h\nhello\nNAME not a dialogue name\nNAME a dialogue name".to_string()
         );
@@ -56,7 +56,7 @@ mod test {
     }
 
     #[test]
-    fn test_dialogue_to_string() {
+    fn dialogue_to_string() {
         let output = Dialogue {
             id: "y".to_string(),
             contents: "This is a bit of dialogue,\nblah blah\nblah blah".to_string(),
diff --git a/src/ending.rs b/src/ending.rs
index 2d503ab..046c900 100644
--- a/src/ending.rs
+++ b/src/ending.rs
@@ -35,7 +35,7 @@ mod test {
     use std::str::FromStr;
 
     #[test]
-    fn test_ending_from_string() {
+    fn ending_from_string() {
         assert_eq!(
             Ending::from_str(include_str!("test-resources/ending")).unwrap(),
             Ending {
@@ -46,7 +46,7 @@ mod test {
     }
 
     #[test]
-    fn test_ending_to_string() {
+    fn ending_to_string() {
         assert_eq!(
             Ending {
                 id: "7".to_string(),
diff --git a/src/exit.rs b/src/exit.rs
index 3c2227c..26801dc 100644
--- a/src/exit.rs
+++ b/src/exit.rs
@@ -103,7 +103,7 @@ mod test {
     use std::str::FromStr;
 
     #[test]
-    fn test_exit_from_string() {
+    fn exit_from_string() {
         assert_eq!(
             Exit::from_str("a 12,13").unwrap(),
             Exit {
@@ -115,7 +115,7 @@ mod test {
     }
 
     #[test]
-    fn test_exit_from_string_with_fx() {
+    fn exit_from_string_with_fx() {
         assert_eq!(
             Exit::from_str("a 12,13 FX slide_u").unwrap(),
             Exit {
@@ -127,7 +127,7 @@ mod test {
     }
 
     #[test]
-    fn test_exit_to_string() {
+    fn exit_to_string() {
         assert_eq!(
             Exit {
                 room_id: "8".to_string(),
@@ -139,7 +139,7 @@ mod test {
     }
 
     #[test]
-    fn test_exit_to_string_with_fx() {
+    fn exit_to_string_with_fx() {
         assert_eq!(
             Exit {
                 room_id: "8".to_string(),
diff --git a/src/image.rs b/src/image.rs
index c9679e7..c38bb7e 100644
--- a/src/image.rs
+++ b/src/image.rs
@@ -100,7 +100,7 @@ mod test {
     use crate::mock;
 
     #[test]
-    fn test_image_from_string() {
+    fn image_from_string() {
         let output = Image::from(
             include_str!("test-resources/image").to_string()
         );
@@ -122,7 +122,7 @@ mod test {
     }
 
     #[test]
-    fn test_image_to_string() {
+    fn image_to_string() {
         let output = mock::image::chequers_1().to_string();
         let expected = include_str!("test-resources/image-chequers-1").to_string();
         assert_eq!(output, expected);
@@ -142,7 +142,7 @@ mod test {
     /// lots of Bitsy games have editor errors where pixels can be placed out of bounds
     /// check that these extraneous pixels are stripped out
     #[test]
-    fn test_image_out_of_bounds() {
+    fn image_out_of_bounds() {
         let output = Image::from(
             include_str!("test-resources/image-oob").to_string()
         );
diff --git a/src/item.rs b/src/item.rs
index bfe287e..d52d99c 100644
--- a/src/item.rs
+++ b/src/item.rs
@@ -81,14 +81,14 @@ mod test {
     use crate::mock;
 
     #[test]
-    fn test_item_from_string() {
+    fn item_from_string() {
         let output = Item::from(include_str!("test-resources/item").to_string());
         let expected = mock::item();
         assert_eq!(output, expected);
     }
 
     #[test]
-    fn test_item_to_string() {
+    fn item_to_string() {
         let output = mock::item().to_string();
         let expected = include_str!("test-resources/item").to_string();
         assert_eq!(output, expected);
diff --git a/src/lib.rs b/src/lib.rs
index 7637e9a..78792de 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -189,7 +189,7 @@ mod test {
     use crate::{ToBase36, optional_data_line, mock, segments_from_string, Quote, Unquote, new_unique_id, try_id};
 
     #[test]
-    fn test_to_base36() {
+    fn to_base36() {
         assert_eq!((37 as u64).to_base36(), "11");
     }
 
@@ -200,7 +200,7 @@ mod test {
     }
 
     #[test]
-    fn test_string_to_segments() {
+    fn string_to_segments() {
         let output = segments_from_string(
             include_str!("./test-resources/segments").to_string()
         );
@@ -216,14 +216,14 @@ mod test {
     }
 
     #[test]
-    fn test_quote() {
+    fn quote() {
         let output = "this is a string.\nIt has 2 lines".to_string().quote();
         let expected = "\"\"\"\nthis is a string.\nIt has 2 lines\n\"\"\"".to_string();
         assert_eq!(output, expected);
     }
 
     #[test]
-    fn test_unquote() {
+    fn unquote() {
         let output = "\"\"\"\nwho the fuck is scraeming \"LOG OFF\" at my house.\nshow yourself, coward.\ni will never log off\n\"\"\"".to_string().unquote();
         let expected = "who the fuck is scraeming \"LOG OFF\" at my house.\nshow yourself, coward.\ni will never log off".to_string();
         assert_eq!(output, expected);
diff --git a/src/palette.rs b/src/palette.rs
index 8644b2d..8c9bc08 100644
--- a/src/palette.rs
+++ b/src/palette.rs
@@ -53,7 +53,7 @@ mod test {
     use crate::palette::Palette;
 
     #[test]
-    fn test_palette_from_string() {
+    fn palette_from_string() {
         let output = Palette::from("PAL 1\nNAME lamplight\n45,45,59\n66,60,39\n140,94,1".to_string());
 
         let expected = Palette {
@@ -82,7 +82,7 @@ mod test {
     }
 
     #[test]
-    fn test_palette_from_string_no_name() {
+    fn palette_from_string_no_name() {
         let output = Palette::from("PAL 9\n45,45,59\n66,60,39\n140,94,1".to_string());
 
         let expected = Palette {
@@ -111,7 +111,7 @@ mod test {
     }
 
     #[test]
-    fn test_palette_to_string() {
+    fn palette_to_string() {
         let output = Palette {
             id: "g".to_string(),
             name: Some("moss".to_string()),
diff --git a/src/position.rs b/src/position.rs
index dd15e00..9ebef0b 100644
--- a/src/position.rs
+++ b/src/position.rs
@@ -42,7 +42,7 @@ mod test {
     use std::str::FromStr;
 
     #[test]
-    fn test_position_from_str() {
+    fn position_from_str() {
         assert_eq!(
             Position::from_str(&"4,12").unwrap(),
             Position { x: 4, y: 12 }
@@ -50,7 +50,7 @@ mod test {
     }
 
     #[test]
-    fn test_position_to_string() {
+    fn position_to_string() {
         assert_eq!(Position { x: 4, y: 12 }.to_string(), "4,12".to_string())
     }
 }
diff --git a/src/room.rs b/src/room.rs
index 55356e3..a81485d 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -234,7 +234,7 @@ mod test {
     use crate::game::{RoomType, RoomFormat};
 
     #[test]
-    fn test_room_from_string() {
+    fn room_from_string() {
         assert_eq!(
             Room::from(include_str!("test-resources/room").to_string()),
             crate::mock::room()
@@ -242,7 +242,7 @@ mod test {
     }
 
     #[test]
-    fn test_room_to_string() {
+    fn room_to_string() {
         assert_eq!(
             crate::mock::room().to_string(RoomFormat::CommaSeparated, RoomType::Room),
             include_str!("test-resources/room").to_string()
@@ -250,7 +250,7 @@ mod test {
     }
 
     #[test]
-    fn test_room_walls_array() {
+    fn room_walls_array() {
         let output = Room::from(include_str!("test-resources/room-with-walls").to_string());
 
         assert_eq!(output.walls, vec!["a".to_string(), "f".to_string()]);
diff --git a/src/sprite.rs b/src/sprite.rs
index d09ed28..347b3c7 100644
--- a/src/sprite.rs
+++ b/src/sprite.rs
@@ -132,7 +132,7 @@ mod test {
     use crate::sprite::Sprite;
 
     #[test]
-    fn test_sprite_from_string() {
+    fn sprite_from_string() {
         let string = include_str!("test-resources/sprite").to_string();
         let output = Sprite::from(string).unwrap();
         let expected = mock::sprite();
@@ -141,7 +141,7 @@ mod test {
     }
 
     #[test]
-    fn test_sprite_to_string() {
+    fn sprite_to_string() {
         assert_eq!(mock::sprite().to_string(), include_str!("test-resources/sprite").to_string());
     }
 }
diff --git a/src/tile.rs b/src/tile.rs
index a3b9873..e3066ad 100644
--- a/src/tile.rs
+++ b/src/tile.rs
@@ -135,7 +135,7 @@ mod test {
     use crate::mock;
 
     #[test]
-    fn test_tile_from_string() {
+    fn tile_from_string() {
         let output = Tile::from(include_str!("test-resources/tile").to_string());
 
         let expected = Tile {
@@ -152,7 +152,7 @@ mod test {
     }
 
     #[test]
-    fn test_tile_to_string() {
+    fn tile_to_string() {
         let output = Tile {
             id: "7a".to_string(),
             name: Some("chequers".to_string()),
@@ -171,7 +171,7 @@ mod test {
     }
 
     #[test]
-    fn test_partial_eq() {
+    fn partial_eq() {
         let     tile_a = crate::mock::tile_default();
         let mut tile_b = crate::mock::tile_default();
         tile_b.id = "0".to_string();
diff --git a/src/variable.rs b/src/variable.rs
index 681bb04..9a52814 100644
--- a/src/variable.rs
+++ b/src/variable.rs
@@ -30,7 +30,7 @@ mod test {
     use crate::variable::Variable;
 
     #[test]
-    fn test_variable_from_string() {
+    fn variable_from_string() {
         assert_eq!(
             Variable::from("VAR a\n42".to_string()),
             Variable {
@@ -41,7 +41,7 @@ mod test {
     }
 
     #[test]
-    fn test_variable_to_string() {
+    fn variable_to_string() {
         let output = Variable {
             id: "c".to_string(),
             initial_value: "57".to_string(),