some changes, Guava support, some testing basics