Added more unit-tests. tweaking around here and there.....