Updated tests and fixed a bug with checkboxes