tidying tests, tested simple blocks