Added tests

85% Code coverage