Tests pass 11.04.2013