working on testing
updated more tests
Merge branches 'master' and 'testing'