Fixed unit tests
Fixed create test