finally fixed tests with this hack

This is not very good hack, but will do for time being