Updated composer, testing stubs