Add some tests
Remove relative import