Update tests, correct lib directory