please remove if it is no longer necessary.. (is this test moved somewhere else? - it should be..)