Added new test and some refacotring