fix for PROB-295
removed old tests