new changes to the RUnit tests (smaller batches)