Testing improved.
Testing improved, bugfix.