Clean up/implement stubbed tests