Add tests and fix button issue (0.3.2)