Exceptions removed. Now testing