add constants to unit test + more @todos