Slightly more tests