Added more testing methods