9 files changed, 37 insertions, 7 deletions
diff --git a/tests/unit/Collections/TAttributeCollectionTest.php b/tests/unit/Collections/TAttributeCollectionTest.php
index f61f58b3..9ce5ef82 100644
--- a/tests/unit/Collections/TAttributeCollectionTest.php
+++ b/tests/unit/Collections/TAttributeCollectionTest.php
@@ -1,6 +1,8 @@
 <?php
 
-Prado::using('System.Collections.TAttributeCollection');
+use Prado\Collections\TAttributeCollection;
+use Prado\Exceptions\TInvalidOperationException;
+
 
 /**
  * @package System.Collections
diff --git a/tests/unit/Collections/TListTest.php b/tests/unit/Collections/TListTest.php
index 9d6950b9..be1da09d 100644
--- a/tests/unit/Collections/TListTest.php
+++ b/tests/unit/Collections/TListTest.php
@@ -1,5 +1,10 @@
 <?php
 
+use Prado\Collections\TList;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Exceptions\TInvalidOperationException;
+
 class ListItem {
     public $data='data';
 }
diff --git a/tests/unit/Collections/TMapTest.php b/tests/unit/Collections/TMapTest.php
index da198eb4..b817c1a0 100644
--- a/tests/unit/Collections/TMapTest.php
+++ b/tests/unit/Collections/TMapTest.php
@@ -1,5 +1,10 @@
 <?php
 
+use Prado\Collections\TList;
+use Prado\Collections\TMap;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidOperationException;
+
 class TMapTest_MapItem {
   public $data='data';
 }
diff --git a/tests/unit/Collections/TPagedDataSourceTest.php b/tests/unit/Collections/TPagedDataSourceTest.php
index ebb8e60d..64b0c4be 100644
--- a/tests/unit/Collections/TPagedDataSourceTest.php
+++ b/tests/unit/Collections/TPagedDataSourceTest.php
@@ -1,6 +1,5 @@
 <?php
 
-Prado::using('System.Collections.TPagedDataSource');
 
 /**
  * @package System.Collections
diff --git a/tests/unit/Collections/TPagedListTest.php b/tests/unit/Collections/TPagedListTest.php
index a225db61..c20c0319 100644
--- a/tests/unit/Collections/TPagedListTest.php
+++ b/tests/unit/Collections/TPagedListTest.php
@@ -1,6 +1,10 @@
 <?php
 
-Prado::using('System.Collections.TPagedList');
+use Prado\Collections\TPagedList;
+use Prado\Collections\TPagedListFetchDataEventParameter;
+use Prado\Collections\TPagedListPageChangedEventParameter;
+use Prado\Exceptions\TInvalidDataValueException;
+
 
 class MyPagedList extends TPagedList {
 
diff --git a/tests/unit/Collections/TPriorityListTest.php b/tests/unit/Collections/TPriorityListTest.php
index d1570302..4219b942 100644
--- a/tests/unit/Collections/TPriorityListTest.php
+++ b/tests/unit/Collections/TPriorityListTest.php
@@ -1,5 +1,11 @@
 <?php
 
+use Prado\Collections\TPriorityList;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
+
 class PriorityListItem
 {
 	var $data = 'data';
@@ -8,7 +14,6 @@ class PriorityListItem
 		$this->data = $d;
 	}
 }
-Prado::using('System.Collections.TPriorityList');
 
 /**
  *	All Test cases for the TList are here.  The TPriorityList should act just like a TList when used exactly like a TList
diff --git a/tests/unit/Collections/TPriorityMapTest.php b/tests/unit/Collections/TPriorityMapTest.php
index 847e09fe..8aa9110d 100644
--- a/tests/unit/Collections/TPriorityMapTest.php
+++ b/tests/unit/Collections/TPriorityMapTest.php
@@ -1,10 +1,14 @@
 <?php
 
+use Prado\Collections\TList;
+use Prado\Collections\TPriorityMap;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidOperationException;
+
 class TPriorityMapTest_MapItem {
   public $data='data';
 }
 
-Prado::using('System.Collections.TPriorityMap');
 /**
  * @package System.Collections
  */
diff --git a/tests/unit/Collections/TQueueTest.php b/tests/unit/Collections/TQueueTest.php
index da60eae3..531214aa 100644
--- a/tests/unit/Collections/TQueueTest.php
+++ b/tests/unit/Collections/TQueueTest.php
@@ -1,6 +1,9 @@
 <?php
 
-Prado::using('System.Collections.TQueue');
+use Prado\Collections\TQueue;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidOperationException;
+
 
 /**
  * @package System.Collections
diff --git a/tests/unit/Collections/TStackTest.php b/tests/unit/Collections/TStackTest.php
index 80dc77c3..39bc50ed 100644
--- a/tests/unit/Collections/TStackTest.php
+++ b/tests/unit/Collections/TStackTest.php
@@ -1,6 +1,9 @@
 <?php
 
-Prado::using('System.Collections.TStack');
+use Prado\Collections\TStack;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidOperationException;
+
 
 /**
  * @package System.Collections