Fixed all testing exceptions
Merged