Created some tests
Small fixes