added whitebox tests and changed presentation