updated tangled files
updated tests
fixed testing functions and updated tests