Split tests and fix