added some more tests for safety measure