Add error handling and testing labs