Tests needs to be rewritten.