Adding meta and more tests