Added better test-cases, removed bad ones