Remove some gross duplication from the tests
WIP on a new test
Fix handling of methods in included files. Fixes #145.