Refactored NBPApiTests