Adding more unittests. Changes to Aspire reflect unittest results.