Progress on mounting, fixing tests