Added colors and integration tests