Update test running functions
Add ruby magic (doesn't seem to actually be doing anything though)
Merge remote-tracking branch 'origin/master'