Adding tests first to do this in a more TDD-way