Test and
Removing parenthesis from if statements
Adding tests and using setters for flags
Removing unnecessary logging
Removed log pkg
Merge