Added Catch for unit testing, split binaries