Built some more comprehensive tests