Final test class
Deleting Test class, no more needed
Fixes issue #225 and #226