added tests for buttonClick, decreased repetition of some tests