Refs #51 - Fix or remove broken tests.