Fix contructor
put mount test back