Further tests working