Add some tests for other situations