revamped some testing