More thorough (kinda) tests