Added extra libraries and variour strategies, more tests