Remove comented code
Add aditional basic test