Refactored tests

Should be more readable now