Added organization tests and fixed some code style