Tests added (not working yet)