Better testing still
Bugfix