Adding more tests and updated paper