Adding more testing