changed defaultValue(Class) to not use zero for wrappers
cleaned givenTest code