refactors whole buncha tests