Fixed junit tests and removed old unusful files.
Merge branch 'master' of https://github.com/63RM4N90/PAW-Sprint-1