More testing, initial promise support