Updates to testing, theme work etc