Updating testing framework
First rubocop changes