Found some issues with tests but need to come back to it later