Updated test packages. Updated/added tests.