Added admin api tests
Fixed eol issues
Fixed EOL issues