refactor tests a bit to make adding functionality easier