Tests refactored, puts deleted