Adding tests for ServerProperties
Committing missed resources