added expecta and some tests