Formatting tweaks. Changed testing to use Python for end to end not shell