added tests for hints; fixed some issues with un-and-catch functions