Add more (basic) tests