Updates to test more stuff