made some changes to try and join up some testing. just committing now to try and clear my head.