fixed todo's in unit tests