Fix any issues tests didn't pick up on
Fix anything tests didn't pick up