Touch ups on AIS testing and Satellite class