Unit tests configured, fix minor design issues