Merge pull request #136 from stef145g/master

Added test updates from develop to master