Working on tests, fixed some coding standard issues