fixed broken unittests