Added a test and fixed some tests
Merge branch 'poc7' into develop