a simple redosign
Major changes
Restructured tests