Adds more testing