Fixed unit tests
minor updates