Finished unittest and removed todo