Removing test.expect() with no args, also moved replacement into its own file