fixed base handler adding; updated tests