removing plan and todo
moving testing code into test directory