#14 - moved over a bunch more tests