More tests and separate existing ones