Added slightly more comprehensive tests