Add more tests for framework classes