modified some tests and other various changes