Norm bounds are set in separate function now
Rename of test functions
Refactored to prepare for common framework