FIX: Get MLS working with tests