Updated some tests, playing around with PyCharm!
Merge remote-tracking branch 'origin/master'