Some fixings and testing