added tests
added tests
completed unit tests