Tests now more flexable and thorough