Removed old test
Hopefully I'll have a working one by monday!
Merge origin/master