Adds better test/implementation for deprecated functionality