cleanup
jam file - more tests working