new testing framwork works --USE THIS NOW