Completed the generic test box implementation

Still needs to be tested