Convert to class for testing
Add fake tests