Handled some TODO items; fixed unit test issue