Added a bit more testing