premiers tests; bug fixes