Added additional tests and Error Handling