removed location_id from users (not necessary), removed extra test files