More thorough testing