fixed unit tests and made some lint changes