reverted two tests to comply with trunk
nicer names for tests
exclude tests which are designed to fail and/or would take too long to complete