added some basic test
Merge branch 'test' into development