Improved Testing
Fixed testing-related issues.