Small bug fix, Tests update.