Rename and move things around
Remove itest macro
Clean up iex tests
Tidy up IEx tests