(#7) - WIP - comment out some tests