adding test unit data and some theme tweaking