added some tests
updated stuff