Improve Testing Suite