Clean up test stuff, added real assets more code