Cleanup tests and remove some deprecated stuff.

Signed-off-by: crynobone <crynobone@gmail.com>