Tests refactored, method order changed for readability