Change paths for vagrant unit test ability
Fix failing tests
Fix spacing