Added more testing functions