More extensive test-suite
