tests
merge
test fixes
Merge branch 'master' of github.com:nadvamir/GU-PSD3-Team-M