Began converting to the 33E. Added some tests from before.