I'm too lazy to fix the unit test Darius hehe ... :)