Moved tests to share a single node. Replaced some deprecated usage with non deprecated.