Removed sorting of tix modules
Added initial test structure
Code simplification and style improvement