Fixing my modal and the tests