Added lots of test methods