add UnitTests
fixed CodingStyle