added test aspect + cleanup