Adding tests on behalf of Monika