Added test with no new functionality, slight refactoring