add more failing tests
refactor