Added, fixed and removed some test methods