Improve functionality for non-selftests