add basic unit test
remove old test
rearrange code in files
add prose declarations of tests