fix class inheritance and include pngs for testing