More tests that need to be made added