New testing configuration

Solves #46 and #47