tidy up, added test stub files made sure they work