Tests need to be rewritten