some minor changes. added full test file