Updated to latest NSB & acceptance tests