indentation changes & moved test