Additions for test