Fixed several tests greatly improved literal matching