Fixed #182
Reformatted tests