Made variables more specific, cleaned up formatting, imported our tests