Added some Tests. Fixed others.
Bugfixes
Added module (again?!)
Added module (again?!)
Added module (again?!)