move more tests to new testing framework; tabs to spaces