Little fix and updated test