Fixed failing test
Fixed code formatting issues