Re-Added test
Removed some Tests