Completed unit tests
merge branch