Reorganised and begun test -- not working, possible bug in core?