[UPDATE] removal of test file
[UPDATE] PR feedback and cleanup