Removed tests helpers from test dir
Fixed unit tests