making progress on TODOs, renamed test files.