Update to 1.0.4-alpha

Also fixed some test code to make it easier to identify the source of a failure