Merge pull request #170 from electrical/master

Testing improvements