Refactored tests to make them concise, also changed title