Added tests, error handling and continue implementation.