Adding integration tests - Not working yet