#29: More tests