conso tests and some (ugly) rewriting. still failing joino tests, commented for now