enhanced and updated tests
added preferences