NOJIRA Updated usecases and fixed test loaders