Switched to Catch for testing, separate test build, minor adjustments