Cleaned up test code. Everything looks solid