Add more tests mostly for style cache, and fix failing test case