fixed trailing comma
fixed some warnings during test