Start introducing meaningful tests (needs cleanup)