tests, bugfixes and rock'n'roll