Small cleanup
Move test to mirror main class hierarchy and reinstate erroneously non-tested tests