Adds some additional tests for other features