Add UnitTests
Fixes Coding Style