Level 1 refactoring and new test
Simple Test added and Level 2 test (not passed)
Refactoring