More framework and testing.