Testing Expanded

Expanded on the testing suite