adding another test and taking care of some TODOs