Small testing tweeks
improving test coverage