Fixed bug in workaround
Added test data