Fixed license information
Added additional unit tests