Get rid of silly code :P
Update tests