Static initializer in a few tests to reduce/remove logging. Cleaned up steps file and also changed feature a bit.