Fixed failing tests, tried to match style guidelines