Changes on tests and added hack button