Added better scan file fixtures, cleaned up and added more disect tests