General 70-536 stuff and testing