fix build bugs that came in with latest changes
fixed database tests on windows