Added Catch unit testing (Thanks Koji!)