Fixed DefaultGadgetSpec request, added more corner case tests