better organizing tests