added TODOs for junit tests