Improve tests and use strict