Fixed unittests - broken imports