Fixed tests to use one true framework, also added Beer and Pub models, and tests.