Closed #167 & restored moov test feedback