Added more unittests
Added filename suffix mapping and unittest
Added license header