Further updates for changing to Catch testing and for Linux compilation.