Added custom exception
Removed unused test