Adjusted tests to allow for shorter tests unless environment variable is set.
Merge branch 'dev' of https://github.com/MichaelONeil/charm into dev