Separating Unit Tests

Hopefully rebuilding the projects will fix the AppVeyor issues.