Reviewed code, added/removed some TODOs

Also deleted TestRandom class, unused