Removed some tests for now. Added others.