#179 rework commit f01c187
#178 change existing tests. Input verification now happens when clicking OK button.
#178 extend usage of existing method
#178 rework commit 1890878