Adds working methods, working tests, at last.