Fixed it so tests 

Working on getting tests working again, so you probably shout *not* merge this until travis passes again :smile: