added lots of tests
Merge branch 'master' of https://github.com/ChristopherTulip/pineapple-repairs