Added test framework
merging 'feature/addtests' into develop