Added test and class stubs