organizing; more tests