Changed colors again and completed api tests
Fixed EOL issues