Split tests ready for unit and integration tests