Some tests and little changes on framework