Actually added Catch tests this time.