Created more stuff and tests