Tests and Fixes