Refactor tests to fit new tests to be implemented in a better way