Refactoring tests and making them mor interesting