Split todo into test and implementation