removed exception handling
added a basic test