New tests and button fixes