added initial test scaffold + cleanup