moved test utils into separate module, fixed specs