Merge branch 'tests'

My branch needs to be updated with master to merge.