add more tests and minor edits fixings from Eliz
remove temporary file