Bugfix with numbers and updating tests
A quick bugfix release