more tests passing
more fixes, adding ehcache