Test & other fixores.