Added init code and shortened tests