Added a test to ensure that server sources work as expected
Did some minor changes to a few unit tests