Added lots of testing