fixes #1655
fixes #1730
JS tests cleaned up