Could you seperate these unit tests? I know I wrote it and am the person to blame, but thats quite some time ago when we did not do things properly :)