Refactor code
Add fake tests