add unit tests
merge from remote