Added in unit tests and cleaned up spacing