Removed TODOs and test stuff