Better testing, getting there...