added test.cpp
test passes now
Merge branch 'feature' into develop