add test for 'simple' version
reformat tests
update 'simple' version