Adds tests/fixes