cleaned up tests & more explicit TODO