Furhter integration testing and cleanup