Refactor tests for Institution