Full site generation! Reworked tests and cleanup