Add new tests for framework