added unit tests + changed feedback messages