verified single tests and edited to TODO list