Added more testing options, removed some extra print lines