Add tests and and Pot
INCOMPLETE: Fixes, use Pot