working, up to date tests!