Add more integration tests and resolve fixture problem.