improved coverage by tests and cleaned up in interaction