adding geweke tests and more refactoring