Added some scale-up tests (that aren't passing just yet)