Revert "Revert "added more tests""

This reverts commit ae3e7b627785bad40af97fca0f9e07a546d0b32c.