Update Tests and some minor modifications