More tests passing and a few bugs fixed
Get reloading passing