Add rudimentary, simplified testing functionality
Expand initial tests