Working on better integration testing