#70 done. finally. some tests fixed, two disabled and will be
fixed soon