Added tests for Beekeeper#preview + other refactoring