And again. Test dtriven my ass! :-p