Fixed the click and listing and stuff.
Added data to test/mock...