Added more testing

Added more testing