Added footer and refactored tests