More tests, and added surfaces