altered includes; added tests for current behaviour