Added Basic Errors and Unit Tests