fixing more todos
removed unused deprecated method
added tests